mmc: sd: optimize erase

To SD, there is no erase group, then the value erase_grp_size
will be default 1. When erasing SD blocks, the blocks will be
erased one by one, which is time consuming.

We use AU_SIZE as a group to speed up the erasing.

Erasing 4MB with a SD2.0 Card with AU_SIZE 4MB.
`time mmc erase 0x100000 0x2000`
time: 44.856 seconds (before optimization)
time: 0.335 seconds  (after optimization)

Signed-off-by: Peng Fan <[email protected]>
Cc: Jaehoon Chung <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Bin Meng <[email protected]>
Cc: Stefan Wahren <[email protected]>
Cc: Clemens Gruber <[email protected]>
Cc: Kever Yang <[email protected]>
Cc: Eric Nelson <[email protected]>
Cc: Stephen Warren <[email protected]>

diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 0f8b5c79d7c6073d47964e25140b1991b119cbc4..22896403754beb6c1b1d0481d02ceecf9e3b4f13 100644 (file)
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -100,8 +100,13 @@ unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
                       & ~(mmc->erase_grp_size - 1)) - 1);
 
        while (blk < blkcnt) {
-               blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ?
-                       mmc->erase_grp_size : (blkcnt - blk);
+               if (IS_SD(mmc) && mmc->ssr.au) {
+                       blk_r = ((blkcnt - blk) > mmc->ssr.au) ?
+                               mmc->ssr.au : (blkcnt - blk);
+               } else {
+                       blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ?
+                               mmc->erase_grp_size : (blkcnt - blk);
+               }
                err = mmc_erase_t(mmc, start + blk, blk_r);
                if (err)
                        break;